From 5a9010623995bf543c641aacd59f92edc8bdc374 Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Wed, 10 Feb 2021 12:51:40 -0700
Subject: [PATCH] remove leftover includes from autotools (#689)

* remove leftovers from autotools

we no longer have config.h, HAVE_CONFIG_H is always false.

* more config.h deletions (from jeeps)
---
 defs.h               |  3 ---
 jeeps/gpslibusb.cc   |  3 ---
 jeeps/gpsusbstub.cc  |  4 ----
 zlib/README.gpsbabel |  5 ++---
 zlib/zconf.h         |  6 ------
 zlib/zconf.h.patch   | 15 ---------------
 6 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 zlib/zconf.h.patch

diff --git a/defs.h b/defs.h
index 5eb339f5f..3179feeaa 100644
--- a/defs.h
+++ b/defs.h
@@ -29,9 +29,6 @@
 #include <optional>               // for optional
 #include <utility>                // for move
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
 #if HAVE_LIBZ
 #include <zlib.h>                 // doesn't really belong here, but is missing elsewhere.
 #elif !ZLIB_INHIBITED
diff --git a/jeeps/gpslibusb.cc b/jeeps/gpslibusb.cc
index def95886c..420728831 100644
--- a/jeeps/gpslibusb.cc
+++ b/jeeps/gpslibusb.cc
@@ -24,9 +24,6 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#if HAVE_CONFIG_H
-#include "jeeps/config.h"
-#endif
 #if HAVE_LIBUSB_1_0
 #ifdef LIBUSB_H_INCLUDE
 // Warning: LIBUSB_H_INCLUDE necessarily includes bracket or double quote
diff --git a/jeeps/gpsusbstub.cc b/jeeps/gpsusbstub.cc
index 2f350b479..327482502 100644
--- a/jeeps/gpsusbstub.cc
+++ b/jeeps/gpsusbstub.cc
@@ -20,10 +20,6 @@
  */
 
 
-#if HAVE_CONFIG_H
-#include "jeeps/config.h"
-#endif
-
 #include "defs.h"
 
 #if !HAVE_LIBUSB_1_0
diff --git a/zlib/README.gpsbabel b/zlib/README.gpsbabel
index 1f9e687a3..3451fe859 100644
--- a/zlib/README.gpsbabel
+++ b/zlib/README.gpsbabel
@@ -1,7 +1,6 @@
 modified subset of zlib-1.2.11 from zlib.net.
 note that zlib 1.2.8 has a seek bug that will bite us.
 other changes after zlib 1.2.8 may be required as well.
-1. zconf.h is modified to include our config.h
-2. contrib/minizip/ioapi.c modifies a conditional adding __CYGWIN__
-3. contrib/minizip/ioapi.h modifies a conditional adding __FreeBSD__
+1. contrib/minizip/ioapi.c modifies a conditional adding __CYGWIN__
+2. contrib/minizip/ioapi.h modifies a conditional adding __FreeBSD__
 See the corresponding .patch files.
diff --git a/zlib/zconf.h b/zlib/zconf.h
index 393c12664..5e1d68a00 100644
--- a/zlib/zconf.h
+++ b/zlib/zconf.h
@@ -8,12 +8,6 @@
 #ifndef ZCONF_H
 #define ZCONF_H
 
-/* Start GPSBabel local */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-/* end GPSBabel local */
-
 /*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
diff --git a/zlib/zconf.h.patch b/zlib/zconf.h.patch
deleted file mode 100644
index 2ac95aaf8..000000000
--- a/zlib/zconf.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../zlib-1.2.8/zconf.h	2013-04-28 16:57:11.000000000 -0600
-+++ zlib/zconf.h	2017-11-11 09:05:50.666012999 -0700
-@@ -8,6 +8,12 @@
- #ifndef ZCONF_H
- #define ZCONF_H
- 
-+/* Start GPSBabel local */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+/* end GPSBabel local */
-+
- /*
-  * If you *really* need a unique prefix for all types and library functions,
-  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-- 
2.30.2